Thanks for splitting this change off into a feature branch, that makes things much easier. I see it's based on your master branch, but unfortunately it looks like you did not set your master branch to point to the same commit as the adblockplus/adblockpluscore master branch. That's why the #5504 changes are being included in this pull request.

Please could you point your master branch at the same revision as the adblockplus/adblockpluscore master branch and then rebase your 1846-remove-locale-param branch on top of that. Hopefully then the correct change(s) will be listed in this pull request.

I tried, bit it didn't let me. I tried git branch -f master , git reset --hard... and others, but it didnt let me. so I set it to the commit in my fork. What command would you use for that?

adblockpluscore git:(master) ✗ git branch -f master 78a11e7
fatal: Cannot force update the current branch.
➜ adblockpluscore git:(master) ✗ git checkout 78a11e7
fatal: reference is not a tree: 78a11e7
➜ adblockpluscore git:(master) ✗ git reset --hard 78a11e7
fatal: Could not parse object '78a11e759e56c29dd4e12b8ad2d601ceb84c12ec'.

You need to add a new remote repository https://github.com/adblockplus/adblockpluscore to your local clone of it using something like git remote add abp https://github.com/adblockplus/adblockpluscore, then fetch the commits from that remote repository, e.g. by using git fetch abp, then you can for example create a branch from abp/master, e.g. git checkout -b issue-xxx abp/master (it can happen that it does not work, I guess it's not difficult to figure it out using git reset --hard), and then you can cherry-pick the corresponding already created commit(s). There are also other shorter ways to do it but that seems pretty straightforward and transparent.

I just had a go with your fork and I had to do something like this:

# Cloned your fork
git clone https://github.com/jaels/adblockpluscore.git
cd adblockpluscore

# Added the adblockplus/adblockpluscore upstream and fetched the branches
# from it.
git remote add upstream https://github.com/adblockplus/adblockpluscore.git
git fetch upstream

# Reset the local master branch to point at upstream/master and the force pushed
# that back to your fork.
git reset --hard upstream/master
git push origin master --force

(Oh, I just noiced Sergz already beat me to it 👍.)

It's well worth spending the time learning some about how Git works, it's a bit boring but it makes this stuff much easier. I found this free ebook pretty helpful https://git-scm.com/book/en/v2

Thanks!!! yeah, no harm improving on that.
Sorry again - I promise to improve...

OK, check the new one, I think it's fine...